backslashes are escaped in the new format - test case BNA to DFW

diff --git a/gpsbabel/google.c b/gpsbabel/google.c
index d73d4e6cdcb6bd581d02e61e19feab4cf7598a97..0b116805064c23ce70f17ba8084adbd41891c7ce 100644 (file)
--- a/gpsbabel/google.c
+++ b/gpsbabel/google.c
@@ -183,6 +183,10 @@ static long decode_goog64( char **str )
        long result = 0;
        unsigned char c = 0;
        unsigned char shift = 0;
+
+        if ( !(**str)) {
+               return 0;
+       }
        
        do 
        {
@@ -306,9 +310,17 @@ google_read(void)
                    end = strchr( encoded_points, '\'' );
                    if ( end ) {
                      *end = '\0';
+                     end = encoded_points;
+                     while ( (end = strstr(end, "\\\\" ))) {
+                       memmove( end, end+1, strlen(end)+1 );
+                     }
                      end = strchr( encoded_levels, '\'' );
                      if ( end ) {
                        *end = '\0';
+                       end = encoded_levels;
+                       while ( (end = strstr(end, "\\\\" ))) {
+                         memmove( end, end+1, strlen(end)+1 );
+                       }
                        goog_poly_e( NULL, NULL );
                      }
                    }